Fix error with git repo discovery and symlinks. #8186
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
(rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
|
@bors: r+ |
|
📌 Commit 5bd74c4 has been approved by |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-azure |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 1, 2020
submodules: update cargo from 90931d9b3 to 258c89644 Changes: ```` Remove unnecessary loop in `maybe_spurious` Fix error with git repo discovery and symlinks. Allow failure when setting file mtime. Support multiple `--target` flags on the CLI build-std: Don't treat std like a "local" package. Allow `cargo package --list` even for things that don't package. ```` I'd like to get rust-lang/cargo#8186 into nightly asap. :) r? @ehuss
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There are some cases where Cargo would generate an error when attempting to discover if a package is inside a git repo when the git repo has a symlink somewhere in its ancestor paths. One way this manifests is with
cargo install --git ...where the given repo has abuild.rsscript. Another scenario iscargo build --manifest-path somelink/Cargo.tomlwheresomelinkis a symlink to the real thing.The issue is that libgit2 is normalizing paths and removing symlinks, but the path Cargo uses is the path with symlinks. This was introduced in #8095.
The solution is to try to canonicalize both paths when trying to get a repo-relative path. If that fails for whatever reason, it shouldn't generate an error since this is just a "best effort" attempt to use git to list package files.
Fixes #8183